<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>

<body>
    <div>
        Have a nice day
        <p>第二次提交</p>
<<<<<<< HEAD
        <p>哈哈</p>
        biu
=======
        <p>我是你爹</p>
<<<<<<< HEAD
        <p>ssss</p>
=======
        <div>这是cjj提交的代码1</div>
>>>>>>> 46447d5f8a474daae0807717de11e6c063d36b6f
>>>>>>> b95e849ddec31ca198769c626ca38b6602c52fa1
    </div>
</body>

</html>